From: Wei Liu <wei.liu2@citrix.com>
Date: Sun, 25 Jan 2015 15:38:59 +0000 (+0000)
Subject: tools/Makefile: fix qemu-xen-traditional build
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3850
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=ee016c2808176814910867350d103f2cc5aec58d;p=xen.git

tools/Makefile: fix qemu-xen-traditional build

In d9740237a ("tools: unhook blktap1 from the build and remove all
references to it"), one spot was left unchanged, which leads to failure
in building qemu-xen-traditional.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/Makefile b/tools/Makefile
index 1ad7a5d878..5d7a75f226 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -158,6 +158,7 @@ qemu-xen-traditional-dir-force-update: qemu-xen-traditional-dir-find
 subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
 	set -e; \
 		$(buildmakevars2shellvars); \
+		export CONFIG_BLKTAP1=n; \
 		cd qemu-xen-traditional-dir; \
 		$(QEMU_ROOT)/xen-setup \
 		$(IOEMU_EXTRA_LDFLAGS) \